extensionUtils: Move ExtensionState definition here

It makes sense to keep extension-related enums in the same module instead
of spreading them between ExtensionSystem and ExtensionUtils.

More importantly, this will make the type available to the extensions-prefs
tool (which runs in a different process and therefore only has access to
a limited set of modules).

https://bugzilla.gnome.org/show_bug.cgi?id=789852

diff --git a/js/misc/extensionUtils.js b/js/misc/extensionUtils.js
index 7e87433337726743c50a5eabf588ff89f83e2c32..e701e824c146ac165e7565fc25b75efa9fc3b436 100644 (file)
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -16,6 +16,19 @@ var ExtensionType = {
     PER_USER: 2
 };
 
+var ExtensionState = {
+    ENABLED: 1,
+    DISABLED: 2,
+    ERROR: 3,
+    OUT_OF_DATE: 4,
+    DOWNLOADING: 5,
+    INITIALIZED: 6,
+
+    // Used as an error state for operations on unknown extensions,
+    // should never be in a real extensionMeta object.
+    UNINSTALLED: 99
+};
+
 // Maps uuid -> metadata object
 var extensions = {};
 

diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index 7034f3c7c8fb2d0df5200a6b9aa1c0156cafaf93..3aeed1bd7721400a01aee84b2cde37cca425666b 100644 (file)
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -6,18 +6,7 @@ const Signals = imports.signals;
 const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 
-var ExtensionState = {
-    ENABLED: 1,
-    DISABLED: 2,
-    ERROR: 3,
-    OUT_OF_DATE: 4,
-    DOWNLOADING: 5,
-    INITIALIZED: 6,
-
-    // Used as an error state for operations on unknown extensions,
-    // should never be in a real extensionMeta object.
-    UNINSTALLED: 99
-};
+const { ExtensionState } = ExtensionUtils;
 
 // Arrays of uuids
 var enabledExtensions;

diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index 061e367775977aeef95a6637450ddf5ac7dc0b31..f15988e6b5a9867d481d48f5b70a90c622eb5527 100644 (file)
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -14,6 +14,8 @@ const Tweener = imports.ui.tweener;
 const Main = imports.ui.main;
 const JsParse = imports.misc.jsParse;
 
+const { ExtensionState } = ExtensionUtils;
+
 const CHEVRON = '>>> ';
 
 /* Imports...feel free to add here as needed */
@@ -688,16 +690,16 @@ var Extensions = class Extensions {
 
     _stateToString(extensionState) {
         switch (extensionState) {
-        case ExtensionSystem.ExtensionState.ENABLED:
+        case ExtensionState.ENABLED:
             return _("Enabled");
-        case ExtensionSystem.ExtensionState.DISABLED:
-        case ExtensionSystem.ExtensionState.INITIALIZED:
+        case ExtensionState.DISABLED:
+        case ExtensionState.INITIALIZED:
             return _("Disabled");
-        case ExtensionSystem.ExtensionState.ERROR:
+        case ExtensionState.ERROR:
             return _("Error");
-        case ExtensionSystem.ExtensionState.OUT_OF_DATE:
+        case ExtensionState.OUT_OF_DATE:
             return _("Out of date");
-        case ExtensionSystem.ExtensionState.DOWNLOADING:
+        case ExtensionState.DOWNLOADING:
             return _("Downloading");
         }
         return 'Unknown'; // Not translated, shouldn't appear